bitkeeper revision 1.1159.1.472 (41ab49ab0UJYMrnMqSqKOFhhX2ypGw)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp

diff --cc .rootkeys
Simple merge

diff --cc linux-2.6.9-xen-sparse/arch/xen/i386/Kconfig
Simple merge

diff --cc linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c
Simple merge

diff --cc linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c
Simple merge

diff --cc xen/arch/x86/dom0_ops.c
Simple merge

diff --cc xen/include/asm-x86/processor.h
Simple merge

diff --cc xen/include/public/dom0_ops.h
Simple merge